bitkeeper revision 1.1195 (420e5ff3SFUc-sHp8lfCe-xCoUlk-A)
authormafetter@fleming.research <mafetter@fleming.research>
Sat, 12 Feb 2005 19:58:43 +0000 (19:58 +0000)
committermafetter@fleming.research <mafetter@fleming.research>
Sat, 12 Feb 2005 19:58:43 +0000 (19:58 +0000)
commitf47e36220675c8dbcb9615c5e28a9fb0d5b8195d
treedee9f62c374fe10e635c49b507e8ad0e38520824
parentcb698d8df45b47f3c4fb843a05c2171382b7d4d1
parentacf041f4371ec15c56fb5de29cf324ca7f8e2437
bitkeeper revision 1.1195 (420e5ff3SFUc-sHp8lfCe-xCoUlk-A)

Hand merge
xen/arch/x86/mm.c
xen/arch/x86/shadow.c
xen/common/keyhandler.c
xen/drivers/char/console.c
xen/include/asm-x86/config.h
xen/include/asm-x86/shadow.h
xen/include/xen/perfc_defn.h